From a1ca15491b75c7e75a9614fd1499292b5980d051 Mon Sep 17 00:00:00 2001 From: Ilias Tsitsimpis Date: Sat, 24 Jan 2026 14:41:42 +0200 Subject: [PATCH] Enable GHCi on all platforms in Debian Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/24098 Gbp-Pq: Name hadrian-enable-interpreter --- hadrian/bindist/config.mk.in | 4 ++-- hadrian/src/Oracles/Setting.hs | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/hadrian/bindist/config.mk.in b/hadrian/bindist/config.mk.in index 407d480e..0d518b14 100644 --- a/hadrian/bindist/config.mk.in +++ b/hadrian/bindist/config.mk.in @@ -152,8 +152,8 @@ GhcWithSMP := $(strip $(if $(filter YESNO, $(ArchSupportsSMP)$(GhcUnregisterised # Whether to include GHCi in the compiler. Depends on whether the RTS linker # has support for this OS/ARCH combination. -OsSupportsGHCi=$(strip $(patsubst $(TargetOS_CPP), YES, $(findstring $(TargetOS_CPP), mingw32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu))) -ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc powerpc64 powerpc64le sparc sparc64 arm aarch64))) +OsSupportsGHCi=YES +ArchSupportsGHCi=YES ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES" GhcWithInterpreter=YES diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs index e854c1cb..4f57c1b1 100644 --- a/hadrian/src/Oracles/Setting.hs +++ b/hadrian/src/Oracles/Setting.hs @@ -196,16 +196,8 @@ hostSupportsRPaths = queryHostTarget (\t -> let os = archOS_OS (tgtArchOs t) -- | Check whether the target supports GHCi. ghcWithInterpreter :: Action Bool ghcWithInterpreter = do - goodOs <- anyTargetOs [ OSMinGW32, OSLinux, OSSolaris2 -- TODO "cygwin32"?, - , OSFreeBSD, OSDragonFly, OSNetBSD, OSOpenBSD - , OSDarwin, OSKFreeBSD ] - goodArch <- (||) <$> - anyTargetArch [ ArchX86, ArchX86_64, ArchPPC - , ArchAArch64, ArchS390X - , ArchPPC_64 ELF_V1, ArchPPC_64 ELF_V2 - , ArchRISCV64 ] - <*> isArmTarget - return $ goodOs && goodArch + -- Enable GHCi on all platforms for Debian + return True -- | Which variant of the ARM architecture is the target (or 'Nothing' if not -- ARM)? -- 2.30.2